Do not unset sensitivity mistakenly in gtk_widget_set_state_flags()

together with commit 8903615a34, this finally fixes bug #640282.
Insensitivity is handled separatedly in _gtk_widget_update_state_flags(),
but the insensitive flag is mistakenly unset afterwards if clear is TRUE
in gtk_widget_set_state_flags().

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c1950894a92a2252bd503a87a171f983d0886a80..7090dc68d521d668448ccb2c67f259d21565556a 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -6969,7 +6969,8 @@ _gtk_widget_update_state_flags (GtkWidget     *widget,
     gtk_widget_set_sensitive (widget,
                               operation != STATE_CHANGE_UNSET);
 
-  flags &= ~(GTK_STATE_FLAG_INSENSITIVE);
+  if (operation != STATE_CHANGE_REPLACE)
+    flags &= ~(GTK_STATE_FLAG_INSENSITIVE);
 
   /* Focused state is meant to be set only on the widget
    * being changed itself, not on the children */